win32: do not use g_clear_pointer also on the clipboard window
authorIgnacio Casal Quinteiro <icq@gnome.org>
Fri, 13 Nov 2015 11:58:45 +0000 (12:58 +0100)
committerIgnacio Casal Quinteiro <icq@gnome.org>
Fri, 13 Nov 2015 11:58:45 +0000 (12:58 +0100)
A follow up on the previous patch. We should use DestroyWindow
directly since it has a different calling convention than
the expected callback for g_clear_pointer

gdk/win32/gdkdisplay-win32.c

index 620dfe774777ffabd685e2115877aefc1f78ca84..b9897c0240327339d1d3a8dbecdc6fe14b964eb7 100644 (file)
@@ -720,8 +720,12 @@ gdk_win32_display_dispose (GObject *object)
       display_win32->hwnd = NULL;
     }
 
-  g_clear_pointer (&display_win32->clipboard_hwnd, (GDestroyNotify)DestroyWindow);
-  _hwnd_next_viewer = NULL;
+  if (display_win32->clipboard_hwnd != NULL)
+    {
+      DestroyWindow (display_win32->clipboard_hwnd);
+      display_win32->clipboard_hwnd = NULL;
+      _hwnd_next_viewer = NULL;
+    }
 
   G_OBJECT_CLASS (gdk_win32_display_parent_class)->dispose (object);
 }